Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 17 May 2010 22:44:26 +0000 (22:44 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 17 May 2010 22:44:26 +0000 (22:44 +0000)

Trivial merge